比较文本

查找两个文本文件之间的差异

Real-time diff

Unified diff

Collapse lines

Highlight change

Syntax highlighting

工具

Diffchecker Desktop The most secure way to run Diffchecker. Get the Diffchecker Desktop app: your diffs never leave your computer!Get Desktop

Untitled diff

Created 8 years agoDiff never expires

Lines
Total
Removed

Words
Total
Removed

To continue using this feature, upgrade to Diffchecker Pro View Pricing

111 lines

Lines
Total
Added

Words
Total
Added

To continue using this feature, upgrade to Diffchecker Pro View Pricing

117 lines

%%{

%(license)s

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

#include "%(class_name)s.h"

#include "{{class_name}}.h"

#include "core/css/HashTools.h"

#include <string.h>

#include "platform/wtf/ASCIICType.h"

#include "platform/wtf/text/AtomicString.h"

#include "platform/wtf/text/WTFString.h"

#ifdef _MSC_VER

// Disable the warnings from casting a 64-bit pointer to 32-bit long

// warning C4302: 'type cast': truncation from 'char (*)[28]' to 'long'

// warning C4311: 'type cast': pointer truncation from 'char (*)[18]' to 'long'

#pragma warning(disable : 4302 4311)

#endif

#if defined(__clang__)

#pragma clang diagnostic push

// TODO(thakis): Remove once we use a gperf that no longer produces "register".

#pragma clang diagnostic ignored "-Wdeprecated-register"

#endif

namespace blink {

static const char propertyNameStringsPool[] = {

%(property_name_strings)s

{% for name in property_names %}

"{{name}}\0"

{% endfor %}

};

static const unsigned short propertyNameStringsOffsets[] = {

%(property_name_offsets)s

{% for offset in property_offsets %}

{{offset}},

{% endfor %}

};

%%}

%%struct-type

%struct-type

struct Property;

%%omit-struct-type

%omit-struct-type

%%language=C++

%language=C++

%%readonly-tables

%readonly-tables

%%global-table

%global-table

%%compare-strncmp

%compare-strncmp

%%define class-name %(class_name)sHash

%define class-name {{class_name}}Hash

%%define lookup-function-name findPropertyImpl

%define lookup-function-name findPropertyImpl

%%define hash-function-name property_hash_function

%define hash-function-name property_hash_function

%%define slot-name name_offset

%define slot-name name_offset

%%define word-array-name property_word_list

%define word-array-name property_word_list

%%enum

%enum

%%%%

%(property_to_enum_map)s

%%%%

#if defined(__clang__)

#pragma clang diagnostic pop

#endif

const Property* FindProperty(const char* str, unsigned int len) {

return %(class_name)sHash::findPropertyImpl(str, len);

return {{class_name}}Hash::findPropertyImpl(str, len);

}

const char* getPropertyName(CSSPropertyID id) {

DCHECK(isCSSPropertyIDWithName(id));

int index = id - firstCSSProperty;

return propertyNameStringsPool + propertyNameStringsOffsets[index];

}

const AtomicString& getPropertyNameAtomicString(CSSPropertyID id) {

DCHECK(isCSSPropertyIDWithName(id));

int index = id - firstCSSProperty;

static AtomicString* propertyStrings =

new AtomicString[lastUnresolvedCSSProperty]; // Leaked.

AtomicString& propertyString = propertyStrings[index];

if (propertyString.IsNull()) {

propertyString = AtomicString(propertyNameStringsPool +

propertyNameStringsOffsets[index]);

}

return propertyString;

}

String getPropertyNameString(CSSPropertyID id) {

// We share the StringImpl with the AtomicStrings.

return getPropertyNameAtomicString(id).GetString();

}

String getJSPropertyName(CSSPropertyID id) {

char result[maxCSSPropertyNameLength + 1];

const char* cssPropertyName = getPropertyName(id);

const char* propertyNamePointer = cssPropertyName;

if (!propertyNamePointer)

return g_empty_string;

char* resultPointer = result;

while (char character = *propertyNamePointer++) {

if (character == '-') {

char nextCharacter = *propertyNamePointer++;

if (!nextCharacter)

break;

character = (propertyNamePointer - 2 != cssPropertyName)

? ToASCIIUpper(nextCharacter) : nextCharacter;

}

*resultPointer++ = character;

}

*resultPointer = '\\0';

*resultPointer = '\0';

return String(result);

}

CSSPropertyID cssPropertyID(const String& string)

{

return resolveCSSPropertyID(unresolvedCSSPropertyID(string));

}

} // namespace blink

已保存差异

原始文本

打开文件

%%{
%(license)s

#include "%(class_name)s.h"
#include "core/css/HashTools.h"
#include <string.h>

#include "platform/wtf/ASCIICType.h"
#include "platform/wtf/text/AtomicString.h"
#include "platform/wtf/text/WTFString.h"

#ifdef _MSC_VER
// Disable the warnings from casting a 64-bit pointer to 32-bit long
// warning C4302: 'type cast': truncation from 'char (*)[28]' to 'long'
// warning C4311: 'type cast': pointer truncation from 'char (*)[18]' to 'long'
#pragma warning(disable : 4302 4311)
#endif

#if defined(__clang__)
#pragma clang diagnostic push
// TODO(thakis): Remove once we use a gperf that no longer produces "register".
#pragma clang diagnostic ignored "-Wdeprecated-register"
#endif

namespace blink {
static const char propertyNameStringsPool[] = {
%(property_name_strings)s
};

static const unsigned short propertyNameStringsOffsets[] = {
%(property_name_offsets)s
};

%%}
%%struct-type
struct Property;
%%omit-struct-type
%%language=C++
%%readonly-tables
%%global-table
%%compare-strncmp
%%define class-name %(class_name)sHash
%%define lookup-function-name findPropertyImpl
%%define hash-function-name property_hash_function
%%define slot-name name_offset
%%define word-array-name property_word_list
%%enum
%%%%
%(property_to_enum_map)s
%%%%

#if defined(__clang__)
#pragma clang diagnostic pop
#endif

const Property* FindProperty(const char* str, unsigned int len) {
  return %(class_name)sHash::findPropertyImpl(str, len);
}

const char* getPropertyName(CSSPropertyID id) {
  DCHECK(isCSSPropertyIDWithName(id));
  int index = id - firstCSSProperty;
  return propertyNameStringsPool + propertyNameStringsOffsets[index];
}

const AtomicString& getPropertyNameAtomicString(CSSPropertyID id) {
  DCHECK(isCSSPropertyIDWithName(id));
  int index = id - firstCSSProperty;
  static AtomicString* propertyStrings =
      new AtomicString[lastUnresolvedCSSProperty]; // Leaked.
  AtomicString& propertyString = propertyStrings[index];
  if (propertyString.IsNull()) {
    propertyString = AtomicString(propertyNameStringsPool +
                     propertyNameStringsOffsets[index]);
  }
  return propertyString;
}

String getPropertyNameString(CSSPropertyID id) {
  // We share the StringImpl with the AtomicStrings.
  return getPropertyNameAtomicString(id).GetString();
}

String getJSPropertyName(CSSPropertyID id) {
  char result[maxCSSPropertyNameLength + 1];
  const char* cssPropertyName = getPropertyName(id);
  const char* propertyNamePointer = cssPropertyName;
  if (!propertyNamePointer)
    return g_empty_string;

char* resultPointer = result;
  while (char character = *propertyNamePointer++) {
    if (character == '-') {
      char nextCharacter = *propertyNamePointer++;
      if (!nextCharacter)
        break;
      character = (propertyNamePointer - 2 != cssPropertyName)
                      ? ToASCIIUpper(nextCharacter) : nextCharacter;
    }
    *resultPointer++ = character;
  }
  *resultPointer = '\\0';
  return String(result);
}

CSSPropertyID cssPropertyID(const String& string)
{
    return resolveCSSPropertyID(unresolvedCSSPropertyID(string));
}

} // namespace blink

更改后文本

打开文件

#include "{{class_name}}.h"
#include "core/css/HashTools.h"
#include <string.h>

#include "platform/wtf/ASCIICType.h"
#include "platform/wtf/text/AtomicString.h"
#include "platform/wtf/text/WTFString.h"

#if defined(__clang__)
#pragma clang diagnostic push
// TODO(thakis): Remove once we use a gperf that no longer produces "register".
#pragma clang diagnostic ignored "-Wdeprecated-register"
#endif

namespace blink {
static const char propertyNameStringsPool[] = {
{% for name in property_names %}
  "{{name}}\0"
{% endfor %}
};

static const unsigned short propertyNameStringsOffsets[] = {
{% for offset in property_offsets %}
  {{offset}},
{% endfor %}
};

%}
%struct-type
struct Property;
%omit-struct-type
%language=C++
%readonly-tables
%global-table
%compare-strncmp
%define class-name {{class_name}}Hash
%define lookup-function-name findPropertyImpl
%define hash-function-name property_hash_function
%define slot-name name_offset
%define word-array-name property_word_list
%enum
%%
{{property_to_enum_map}}
%%

#if defined(__clang__)
#pragma clang diagnostic pop
#endif

const Property* FindProperty(const char* str, unsigned int len) {
  return {{class_name}}Hash::findPropertyImpl(str, len);
}

const char* getPropertyName(CSSPropertyID id) {
  DCHECK(isCSSPropertyIDWithName(id));
  int index = id - firstCSSProperty;
  return propertyNameStringsPool + propertyNameStringsOffsets[index];
}

String getPropertyNameString(CSSPropertyID id) {
  // We share the StringImpl with the AtomicStrings.
  return getPropertyNameAtomicString(id).GetString();
}

CSSPropertyID cssPropertyID(const String& string)
{
    return resolveCSSPropertyID(unresolvedCSSPropertyID(string));
}

} // namespace blink