Changeset 150665 in webkit


Ignore:
Timestamp:
May 24, 2013 4:30:36 PM (11 years ago)
Author:
andersca@apple.com
Message:

Move history property list writer to WebKit
​https://bugs.webkit.org/show_bug.cgi?id=116746

Reviewed by Tim Horton.

Source/WebCore:

Remove files from the Xcode project and remove symbols that now live in WebKit.

  • WebCore.exp.in:
  • WebCore.xcodeproj/project.pbxproj:

Source/WebKit:

Add files to the Xcode project.

  • WebKit.xcodeproj/project.pbxproj:

Source/WebKit/mac:

Move WebCore history files to WebKit since they're only used by WebKit now.

  • History/BinaryPropertyList.cpp: Renamed from Source/WebCore/platform/cf/BinaryPropertyList.cpp.
  • History/BinaryPropertyList.h: Renamed from Source/WebCore/platform/cf/BinaryPropertyList.h.
  • History/HistoryPropertyList.cpp: Renamed from Source/WebCore/history/cf/HistoryPropertyList.cpp.
  • History/HistoryPropertyList.h: Renamed from Source/WebCore/history/cf/HistoryPropertyList.h.
  • History/WebHistory.mm:
Location:
trunk/Source
Files:
7 edited
4 moved

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r150664 r150665  
     12013-05-24  Anders Carlsson  <andersca@apple.com>
     2
     3        Move history property list writer to WebKit
     4        https://bugs.webkit.org/show_bug.cgi?id=116746
     5
     6        Reviewed by Tim Horton.
     7
     8        Remove files from the Xcode project and remove symbols that now live in WebKit.
     9
     10        * WebCore.exp.in:
     11        * WebCore.xcodeproj/project.pbxproj:
     12
    1132013-05-24  Christophe Dumez  <ch.dumez@sisa.samsung.com>
    214

  • trunk/Source/WebCore/WebCore.exp.in

    r150663 r150665  
    761761__ZN7WebCore23encodeHostNameWithRangeEP8NSString8_NSRange
    762762__ZN7WebCore23getHostnamesWithCookiesERKNS_21NetworkStorageSessionERN3WTF7HashSetINS3_6StringENS3_10StringHashENS3_10HashTraitsIS5_EEEE
    763 __ZN7WebCore24BinaryPropertyListWriter17writePropertyListEv
    764763__ZN7WebCore24CachedResourceHandleBase11setResourceEPNS_14CachedResourceE
    765764__ZN7WebCore24ComposedShadowTreeWalker10firstChildEv
    … …  
    783782__ZN7WebCore24notifyHistoryItemChangedE
    784783__ZN7WebCore24pathByAppendingComponentERKN3WTF6StringES3_
    785 __ZN7WebCore25HistoryPropertyListWriter11releaseDataEv
    786 __ZN7WebCore25HistoryPropertyListWriter12writeObjectsERNS_30BinaryPropertyListObjectStreamE
    787 __ZN7WebCore25HistoryPropertyListWriter16writeHistoryItemERNS_30BinaryPropertyListObjectStreamEPNS_11HistoryItemE
    788 __ZN7WebCore25HistoryPropertyListWriter6bufferEm
    789 __ZN7WebCore25HistoryPropertyListWriterC2Ev
    790784__ZN7WebCore25ImmutableStylePropertySetD1Ev
    791785__ZN7WebCore25addLanguageChangeObserverEPvPFvS0_E
    … …  
    16821676__ZTVN7WebCore16IconDatabaseBaseE
    16831677__ZTVN7WebCore17FrameLoaderClientE
    1684 __ZTVN7WebCore25HistoryPropertyListWriterE
    16851678__ZTVN7WebCore28InspectorFrontendClientLocal8SettingsE
    16861679_filenameByFixingIllegalCharacters

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r150663 r150665  
    28482848                935FBCF209BA143B00E230B1 /* ExceptionCode.h in Headers */ = {isa = PBXBuildFile; fileRef = 935FBCF109BA143B00E230B1 /* ExceptionCode.h */; settings = {ATTRIBUTES = (Private, ); }; };
    28492849                9362640B0DE1137D009D5A00 /* CSSReflectionDirection.h in Headers */ = {isa = PBXBuildFile; fileRef = 9362640A0DE1137D009D5A00 /* CSSReflectionDirection.h */; settings = {ATTRIBUTES = (Private, ); }; };
    2850                 9363B62C0F8E8FE000803810 /* HistoryPropertyList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9363B62A0F8E8FE000803810 /* HistoryPropertyList.cpp */; };
    2851                 9363B62D0F8E8FE000803810 /* HistoryPropertyList.h in Headers */ = {isa = PBXBuildFile; fileRef = 9363B62B0F8E8FE000803810 /* HistoryPropertyList.h */; settings = {ATTRIBUTES = (Private, ); }; };
    28522850                9370918D1416D86B00477333 /* textAreaResizeCorner@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 9370918C1416D86B00477333 /* textAreaResizeCorner@2x.png */; };
    28532851                9377ABA015DEFEEF0031FD04 /* Pagination.h in Headers */ = {isa = PBXBuildFile; fileRef = 9377AB9F15DEFEEF0031FD04 /* Pagination.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    28572855                9380F47409A11AB4001FDB34 /* Widget.h in Headers */ = {isa = PBXBuildFile; fileRef = 9380F47209A11AB4001FDB34 /* Widget.h */; settings = {ATTRIBUTES = (Private, ); }; };
    28582856                9380F47809A11ACC001FDB34 /* WidgetMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9380F47709A11ACC001FDB34 /* WidgetMac.mm */; };
    2859                 938192030F87E1E600D5352A /* BinaryPropertyList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 938192020F87E1E600D5352A /* BinaryPropertyList.cpp */; };
    2860                 938192050F87E1EC00D5352A /* BinaryPropertyList.h in Headers */ = {isa = PBXBuildFile; fileRef = 938192040F87E1EC00D5352A /* BinaryPropertyList.h */; settings = {ATTRIBUTES = (Private, ); }; };
    28612857                9382AAB40D8C386100F357A6 /* NodeWithIndex.h in Headers */ = {isa = PBXBuildFile; fileRef = 9382AAB10D8C386100F357A6 /* NodeWithIndex.h */; };
    28622858                9382DF5810A8D5C900925652 /* ColorSpace.h in Headers */ = {isa = PBXBuildFile; fileRef = 9382DF5710A8D5C900925652 /* ColorSpace.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    92739269                935FBCF109BA143B00E230B1 /* ExceptionCode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExceptionCode.h; sourceTree = "<group>"; };
    92749270                9362640A0DE1137D009D5A00 /* CSSReflectionDirection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSReflectionDirection.h; sourceTree = "<group>"; };
    9275                 9363B62A0F8E8FE000803810 /* HistoryPropertyList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HistoryPropertyList.cpp; sourceTree = "<group>"; };
    9276                 9363B62B0F8E8FE000803810 /* HistoryPropertyList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HistoryPropertyList.h; sourceTree = "<group>"; };
    92779271                936DD03A09CEAC270056AE8C /* Range.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Range.idl; sourceTree = "<group>"; };
    92789272                9370918C1416D86B00477333 /* textAreaResizeCorner@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "textAreaResizeCorner@2x.png"; sourceTree = "<group>"; };
    … …  
    92839277                9380F47209A11AB4001FDB34 /* Widget.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Widget.h; sourceTree = "<group>"; };
    92849278                9380F47709A11ACC001FDB34 /* WidgetMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = WidgetMac.mm; sourceTree = "<group>"; };
    9285                 938192020F87E1E600D5352A /* BinaryPropertyList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BinaryPropertyList.cpp; sourceTree = "<group>"; };
    9286                 938192040F87E1EC00D5352A /* BinaryPropertyList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BinaryPropertyList.h; sourceTree = "<group>"; };
    92879279                9382AAB10D8C386100F357A6 /* NodeWithIndex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NodeWithIndex.h; sourceTree = "<group>"; };
    92889280                9382DF5710A8D5C900925652 /* ColorSpace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ColorSpace.h; sourceTree = "<group>"; };
    … …  
    1340813400                        isa = PBXGroup;
    1340913401                        children = (
    13410                                 938192020F87E1E600D5352A /* BinaryPropertyList.cpp */,
    13411                                 938192040F87E1EC00D5352A /* BinaryPropertyList.h */,
    1341213402                                5160306B0CC4362300C8AC25 /* FileSystemCF.cpp */,
    1341313403                                1A98956A0AA78F80005EF5EF /* KURLCFNet.cpp */,
    … …  
    1433014320                        isa = PBXGroup;
    1433114321                        children = (
    14332                                 9363B6290F8E8FE000803810 /* cf */,
    1433314322                                5160F4920B0AA71500C1D2AF /* mac */,
    1433414323                                BCA8C81D11E3D36900812FB7 /* BackForwardController.cpp */,
    … …  
    1567215661                        );
    1567315662                        path = filters;
    15674                         sourceTree = "<group>";
    15675                 };
    15676                 9363B6290F8E8FE000803810 /* cf */ = {
    15677                         isa = PBXGroup;
    15678                         children = (
    15679                                 9363B62A0F8E8FE000803810 /* HistoryPropertyList.cpp */,
    15680                                 9363B62B0F8E8FE000803810 /* HistoryPropertyList.h */,
    15681                         );
    15682                         path = cf;
    1568315663                        sourceTree = "<group>";
    1568415664                };
    … …  
    2104521025                                BCE789861120E7A60060ECE5 /* BidiRun.h in Headers */,
    2104621026                                A8C402931348B2220063F1E5 /* BidiRunList.h in Headers */,
    21047                                 938192050F87E1EC00D5352A /* BinaryPropertyList.h in Headers */,
    2104821027                                973AA3FA15D0891B00E38A85 /* BindingSecurity.h in Headers */,
    2104921028                                973AA3F515D088F000E38A85 /* BindingState.h in Headers */,
    … …  
    2195521934                                97DCE20210807C750057D394 /* HistoryController.h in Headers */,
    2195621935                                51741D110B07259A00ED442C /* HistoryItem.h in Headers */,
    21957                                 9363B62D0F8E8FE000803810 /* HistoryPropertyList.h in Headers */,
    2195821936                                4969B0F313D0B33F00DF3521 /* HitTestingTransformState.h in Headers */,
    2195921937                                2D8287F716E4A0380086BD00 /* HitTestLocation.h in Headers */,
    … …  
    2450024478                                B2C3DA230D006C1D00EF6F26 /* BidiContext.cpp in Sources */,
    2450124479                                BCE7898B1120E8020060ECE5 /* BidiRun.cpp in Sources */,
    24502                                 938192030F87E1E600D5352A /* BinaryPropertyList.cpp in Sources */,
    2450324480                                973AA3F915D0891B00E38A85 /* BindingSecurity.cpp in Sources */,
    2450424481                                973AA3F415D088F000E38A85 /* BindingState.cpp in Sources */,
    … …  
    2513725114                                51741D120B07259A00ED442C /* HistoryItem.cpp in Sources */,
    2513825115                                5160F4980B0AA75F00C1D2AF /* HistoryItemMac.mm in Sources */,
    25139                                 9363B62C0F8E8FE000803810 /* HistoryPropertyList.cpp in Sources */,
    2514025116                                4969B0F213D0B33F00DF3521 /* HitTestingTransformState.cpp in Sources */,
    2514125117                                2D8287F616E4A0380086BD00 /* HitTestLocation.cpp in Sources */,

  • trunk/Source/WebKit/ChangeLog

    r150434 r150665  
     12013-05-24  Anders Carlsson  <andersca@apple.com>
     2
     3        Move history property list writer to WebKit
     4        https://bugs.webkit.org/show_bug.cgi?id=116746
     5
     6        Reviewed by Tim Horton.
     7
     8        Add files to the Xcode project.
     9
     10        * WebKit.xcodeproj/project.pbxproj:
     11
    1122013-05-21  Carlos Garcia Campos  <cgarcia@igalia.com>
    213

  • trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj

    r149574 r150665  
    2626                1A4DF5E40EC8D104006BD4B4 /* WebBaseNetscapePluginView.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A4DF5E20EC8D104006BD4B4 /* WebBaseNetscapePluginView.h */; };
    2727                1A4DF5E50EC8D104006BD4B4 /* WebBaseNetscapePluginView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A4DF5E30EC8D104006BD4B4 /* WebBaseNetscapePluginView.mm */; };
     28                1A60519117502A5D00BC62F5 /* BinaryPropertyList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A60518D17502A5D00BC62F5 /* BinaryPropertyList.cpp */; };
     29                1A60519217502A5D00BC62F5 /* BinaryPropertyList.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A60518E17502A5D00BC62F5 /* BinaryPropertyList.h */; };
     30                1A60519317502A5D00BC62F5 /* HistoryPropertyList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A60518F17502A5D00BC62F5 /* HistoryPropertyList.cpp */; };
     31                1A60519417502A5D00BC62F5 /* HistoryPropertyList.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A60519017502A5D00BC62F5 /* HistoryPropertyList.h */; };
    2832                1A74A28E0F4F75400082E228 /* WebTextInputWindowController.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A74A28C0F4F75400082E228 /* WebTextInputWindowController.h */; };
    2933                1A74A28F0F4F75400082E228 /* WebTextInputWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A74A28D0F4F75400082E228 /* WebTextInputWindowController.m */; };
    … …  
    399403                1A4DF5E20EC8D104006BD4B4 /* WebBaseNetscapePluginView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebBaseNetscapePluginView.h; sourceTree = "<group>"; };
    400404                1A4DF5E30EC8D104006BD4B4 /* WebBaseNetscapePluginView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebBaseNetscapePluginView.mm; sourceTree = "<group>"; };
     405                1A60518D17502A5D00BC62F5 /* BinaryPropertyList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BinaryPropertyList.cpp; sourceTree = "<group>"; };
     406                1A60518E17502A5D00BC62F5 /* BinaryPropertyList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BinaryPropertyList.h; sourceTree = "<group>"; };
     407                1A60518F17502A5D00BC62F5 /* HistoryPropertyList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HistoryPropertyList.cpp; sourceTree = "<group>"; };
     408                1A60519017502A5D00BC62F5 /* HistoryPropertyList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HistoryPropertyList.h; sourceTree = "<group>"; };
    401409                1A74A28C0F4F75400082E228 /* WebTextInputWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebTextInputWindowController.h; sourceTree = "<group>"; };
    402410                1A74A28D0F4F75400082E228 /* WebTextInputWindowController.m */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.objc; fileEncoding = 4; path = WebTextInputWindowController.m; sourceTree = "<group>"; };
    … …  
    10111019                        isa = PBXGroup;
    10121020                        children = (
     1021                                1A60518D17502A5D00BC62F5 /* BinaryPropertyList.cpp */,
     1022                                1A60518E17502A5D00BC62F5 /* BinaryPropertyList.h */,
     1023                                1A60518F17502A5D00BC62F5 /* HistoryPropertyList.cpp */,
     1024                                1A60519017502A5D00BC62F5 /* HistoryPropertyList.h */,
    10131025                                3944607D020F50ED0ECA1767 /* WebBackForwardList.h */,
    10141026                                3944607E020F50ED0ECA1767 /* WebBackForwardList.mm */,
    … …  
    14071419                        buildActionMask = 2147483647;
    14081420                        files = (
     1421                                1A60519217502A5D00BC62F5 /* BinaryPropertyList.h in Headers */,
    14091422                                9398106A0824BF01008DF038 /* CarbonUtils.h in Headers */,
    14101423                                939810650824BF01008DF038 /* CarbonWindowAdapter.h in Headers */,
    … …  
    16021615                                A5DEFC0B11D5331C00885273 /* WebSecurityOriginInternal.h in Headers */,
    16031616                                A5DEFC0C11D5331C00885273 /* WebSecurityOriginPrivate.h in Headers */,
     1617                                1A60519417502A5D00BC62F5 /* HistoryPropertyList.h in Headers */,
    16041618                                BC26C69E10B743F400B687ED /* WebSerializedJSValue.h in Headers */,
    16051619                                F67DD7E6125E4527007BDCB8 /* WebSerializedJSValuePrivate.h in Headers */,
    … …  
    18981912                                4BF99F910AE050BC00815C2B /* WebEditorClient.mm in Sources */,
    18991913                                DD89682109AA87240097E7F0 /* WebElementDictionary.mm in Sources */,
     1914                                1A60519117502A5D00BC62F5 /* BinaryPropertyList.cpp in Sources */,
    19001915                                939810FC0824BF01008DF038 /* WebFormDelegate.m in Sources */,
    19011916                                7C01CB86173435C900C5D807 /* PopupMenuMac.mm in Sources */,
    … …  
    19831998                                C0167BF90D7F5DD00028696E /* WebScriptDebugger.mm in Sources */,
    19841999                                C0B1F7E910AC8E3100C925D9 /* WebScriptWorld.mm in Sources */,
     2000                                1A60519317502A5D00BC62F5 /* HistoryPropertyList.cpp in Sources */,
    19852001                                A5DEFC0A11D5331C00885273 /* WebSecurityOrigin.mm in Sources */,
    19862002                                BC26C6A510B7447A00B687ED /* WebSerializedJSValue.mm in Sources */,

  • trunk/Source/WebKit/mac/ChangeLog

    r150663 r150665  
     12013-05-24  Anders Carlsson  <andersca@apple.com>
     2
     3        Move history property list writer to WebKit
     4        https://bugs.webkit.org/show_bug.cgi?id=116746
     5
     6        Reviewed by Tim Horton.
     7
     8        Move WebCore history files to WebKit since they're only used by WebKit now.
     9
     10        * History/BinaryPropertyList.cpp: Renamed from Source/WebCore/platform/cf/BinaryPropertyList.cpp.
     11        * History/BinaryPropertyList.h: Renamed from Source/WebCore/platform/cf/BinaryPropertyList.h.
     12        * History/HistoryPropertyList.cpp: Renamed from Source/WebCore/history/cf/HistoryPropertyList.cpp.
     13        * History/HistoryPropertyList.h: Renamed from Source/WebCore/history/cf/HistoryPropertyList.h.
     14        * History/WebHistory.mm:
     15
    1162013-05-24  Christophe Dumez  <ch.dumez@sisa.samsung.com>
    217

  • trunk/Source/WebKit/mac/History/BinaryPropertyList.cpp

    r150664 r150665  
    2424 */
    2525
    26 #include "config.h"
    2726#include "BinaryPropertyList.h"
    2827
     28#include <limits>
    2929#include <wtf/HashMap.h>
    3030#include <wtf/HashSet.h>
    3131#include <wtf/text/StringHash.h>
    32 #include <limits>
    3332
    3433using namespace std;
    35 
    36 namespace WebCore {
    3734
    3835static const size_t headerSize = 8;
    … …  
    750747    switch (m_objectReferenceSize) {
    751748#ifdef __LP64__
    752         case 8:
    753             appendByte(reference >> 56);
    754         case 7:
    755             appendByte(reference >> 48);
    756         case 6:
    757             appendByte(reference >> 40);
    758         case 5:
    759             appendByte(reference >> 32);
     749    case 8:
     750        appendByte(reference >> 56);
     751    case 7:
     752        appendByte(reference >> 48);
     753    case 6:
     754        appendByte(reference >> 40);
     755    case 5:
     756        appendByte(reference >> 32);
    760757#endif
    761         case 4:
    762             appendByte(reference >> 24);
    763         case 3:
    764             appendByte(reference >> 16);
    765         case 2:
    766             appendByte(reference >> 8);
    767         case 1:
    768             appendByte(reference);
     758    case 4:
     759        appendByte(reference >> 24);
     760    case 3:
     761        appendByte(reference >> 16);
     762    case 2:
     763        appendByte(reference >> 8);
     764    case 1:
     765        appendByte(reference);
    769766    }
    770767}
    … …  
    779776    switch (m_offsetSize) {
    780777#ifdef __LP64__
    781         case 8:
    782             offsetTableEntry[-8] = offset >> 56;
    783         case 7:
    784             offsetTableEntry[-7] = offset >> 48;
    785         case 6:
    786             offsetTableEntry[-6] = offset >> 40;
    787         case 5:
    788             offsetTableEntry[-5] = offset >> 32;
     778    case 8:
     779        offsetTableEntry[-8] = offset >> 56;
     780    case 7:
     781        offsetTableEntry[-7] = offset >> 48;
     782    case 6:
     783        offsetTableEntry[-6] = offset >> 40;
     784    case 5:
     785        offsetTableEntry[-5] = offset >> 32;
    789786#endif
    790         case 4:
    791             offsetTableEntry[-4] = offset >> 24;
    792         case 3:
    793             offsetTableEntry[-3] = offset >> 16;
    794         case 2:
    795             offsetTableEntry[-2] = offset >> 8;
    796         case 1:
    797             offsetTableEntry[-1] = offset;
     787    case 4:
     788        offsetTableEntry[-4] = offset >> 24;
     789    case 3:
     790        offsetTableEntry[-3] = offset >> 16;
     791    case 2:
     792        offsetTableEntry[-2] = offset >> 8;
     793    case 1:
     794        offsetTableEntry[-1] = offset;
    798795    }
    799796}
    … …  
    803800    switch (m_objectReferenceSize) {
    804801#ifdef __LP64__
    805         case 8:
    806             *--m_currentAggregateBufferByte = reference >> 56;
    807         case 7:
    808             *--m_currentAggregateBufferByte = reference >> 48;
    809         case 6:
    810             *--m_currentAggregateBufferByte = reference >> 40;
    811         case 5:
    812             *--m_currentAggregateBufferByte = reference >> 32;
     802    case 8:
     803        *--m_currentAggregateBufferByte = reference >> 56;
     804    case 7:
     805        *--m_currentAggregateBufferByte = reference >> 48;
     806    case 6:
     807        *--m_currentAggregateBufferByte = reference >> 40;
     808    case 5:
     809        *--m_currentAggregateBufferByte = reference >> 32;
    813810#endif
    814         case 4:
    815             *--m_currentAggregateBufferByte = reference >> 24;
    816         case 3:
    817             *--m_currentAggregateBufferByte = reference >> 16;
    818         case 2:
    819             *--m_currentAggregateBufferByte = reference >> 8;
    820         case 1:
    821             *--m_currentAggregateBufferByte = reference;
     811    case 4:
     812        *--m_currentAggregateBufferByte = reference >> 24;
     813    case 3:
     814        *--m_currentAggregateBufferByte = reference >> 16;
     815    case 2:
     816        *--m_currentAggregateBufferByte = reference >> 8;
     817    case 1:
     818        *--m_currentAggregateBufferByte = reference;
    822819    }
    823820    ASSERT(m_currentByte <= m_currentAggregateBufferByte);
    … …  
    828825    BinaryPropertyListSerializer serializer(*this);
    829826}
    830 
    831 }

  • trunk/Source/WebKit/mac/History/BinaryPropertyList.h

    r150664 r150665  
    3131#include <wtf/Forward.h>
    3232#include <wtf/Vector.h>
    33 
    34 namespace WebCore {
    3533
    3634// Writes a limited subset of binary property lists.
    … …  
    105103};
    106104
    107 }
    108 
    109 #endif
     105#endif // BinaryPropertyList_h

  • trunk/Source/WebKit/mac/History/HistoryPropertyList.cpp

    r150664 r150665  
    2424 */
    2525
    26 #include "config.h"
    2726#include "HistoryPropertyList.h"
    2827
    29 #include "HistoryItem.h"
     28#include <WebCore/HistoryItem.h>
    3029#include <wtf/StringExtras.h>
    3130
    32 namespace WebCore {
     31using namespace WebCore;
    3332
    3433static const int currentFileVersion = 1;
    … …  
    154153}
    155154
    156 }

  • trunk/Source/WebKit/mac/History/HistoryPropertyList.h

    r150664 r150665  
    3232
    3333namespace WebCore {
    34 
    3534class HistoryItem;
     35}
    3636
    3737class HistoryPropertyListWriter : public BinaryPropertyListWriter {
    … …  
    4242    HistoryPropertyListWriter();
    4343
    44     void writeHistoryItem(BinaryPropertyListObjectStream&, HistoryItem*);
     44    void writeHistoryItem(BinaryPropertyListObjectStream&, WebCore::HistoryItem*);
    4545
    4646private:
    … …  
    6565};
    6666
    67 }
    68 
    69 #endif
     67#endif // HistoryPropertyList_h

  • trunk/Source/WebKit/mac/History/WebHistory.mm

    r133977 r150665  
    2929#import "WebHistoryInternal.h"
    3030
     31#import "HistoryPropertyList.h"
    3132#import "WebHistoryItemInternal.h"
    3233#import "WebKitLogging.h"
    … …  
    3435#import "WebTypesInternal.h"
    3536#import <WebCore/HistoryItem.h>
    36 #import <WebCore/HistoryPropertyList.h>
    3737#import <WebCore/PageGroup.h>
    3838
Note: See TracChangeset for help on using the changeset viewer.